auto merge of #1045 : alexcrichton/cargo/update-git2, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 18 Dec 2014 17:13:45 +0000 (17:13 +0000)
committerbors <bors@rust-lang.org>
Thu, 18 Dec 2014 17:13:45 +0000 (17:13 +0000)
Should fix #1032 and #1029


Trivial merge